+++ /dev/null
-From: Luca Bruno <lucab@debian.org>
-Description: Add overrides for stage1 build dependencies
-Forwarded: not-needed
---- /dev/null
-+++ b/.cargo/config
-@@ -0,0 +1,50 @@
-+paths = [
-+"./deps/advapi32-sys-0.1.1",
-+"./deps/aho-corasick-0.2.1",
-+"./deps/bitflags-0.1.1",
-+"./deps/curl-0.2.10",
-+"./deps/curl-sys-0.1.24",
-+"./deps/docopt-0.6.67",
-+"./deps/encoding-0.2.32",
-+"./deps/encoding-index-japanese-1.20141219.5",
-+"./deps/encoding-index-korean-1.20141219.5",
-+"./deps/encoding-index-simpchinese-1.20141219.5",
-+"./deps/encoding-index-singlebyte-1.20141219.5",
-+"./deps/encoding-index-tradchinese-1.20141219.5",
-+"./deps/encoding_index_tests-0.1.4",
-+"./deps/env_logger-0.3.1",
-+"./deps/filetime-0.1.4",
-+"./deps/flate2-0.2.7",
-+"./deps/gcc-0.3.8",
-+"./deps/git2-0.2.12",
-+"./deps/git2-curl-0.2.4",
-+"./deps/glob-0.2.10",
-+"./deps/kernel32-sys-0.1.2",
-+"./deps/libc-0.1.8",
-+"./deps/libgit2-sys-0.2.17",
-+"./deps/libssh2-sys-0.1.25",
-+"./deps/libz-sys-0.1.6",
-+"./deps/log-0.3.1",
-+"./deps/matches-0.1.2",
-+"./deps/memchr-0.1.3",
-+"./deps/miniz-sys-0.1.5",
-+"./deps/num_cpus-0.2.6",
-+"./deps/openssl-sys-0.6.3",
-+"./deps/pkg-config-0.3.5",
-+"./deps/regex-0.1.38",
-+"./deps/regex-syntax-0.1.2",
-+"./deps/rustc-serialize-0.3.15",
-+"./deps/semver-0.1.19",
-+"./deps/strsim-0.3.0",
-+"./deps/tar-0.2.14",
-+"./deps/term-0.2.9",
-+"./deps/threadpool-0.1.4",
-+"./deps/time-0.1.26",
-+"./deps/toml-0.1.21",
-+"./deps/url-0.2.35",
-+"./deps/winapi-0.1.23",
-+"./deps/winapi-build-0.1.0",
-+]
-+
-+[registry]
-+index = "file://--TOPDIR--/index/"
--- /dev/null
+Fromm: Luca Bruno <lucab@debian.org>
+Description: Remove stage1 extra dependencies
+ Fetching extra dev-dependencies is not yet supported by bootstrap.py
+ and they are not need to build. However, cargo will try to download
+ them before building stage1.
+Forwarded: not-needed
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -17,7 +17,7 @@
+ path = "src/cargo/lib.rs"
+
+ [dependencies]
+-advapi32-sys = "0.1"
++#advapi32-sys = "0.1"
+ crates-io = { path = "src/crates-io", version = "0.1" }
+ crossbeam = "0.1"
+ curl = "0.2"
+@@ -28,7 +28,7 @@
+ git2 = "0.3"
+ git2-curl = "0.3"
+ glob = "0.2"
+-kernel32-sys = "0.1"
++#kernel32-sys = "0.1"
+ libc = "0.1"
+ libgit2-sys = "0.3"
+ log = "0.3"
+@@ -41,13 +41,13 @@
+ time = "0.1"
+ toml = "0.1"
+ url = "0.2"
+-winapi = "0.2"
++#winapi = "0.2"
+
+-[dev-dependencies]
+-tempdir = "0.3"
+-hamcrest = "0.1"
+-bufstream = "0.1"
+-filetime = "0.1"
++#[dev-dependencies]
++#tempdir = "0.3"
++#hamcrest = "0.1"
++#bufstream = "0.1"
++#filetime = "0.1"
+
+ [[bin]]
+ name = "cargo"
--- /dev/null
+Fromm: Luca Bruno <lucab@debian.org>
+Description: Misc fixes to build libgit2-sys
+Forwarded: not-needed
+--- a/deps/libgit2-sys-0.3.8/build.rs
++++ b/deps/libgit2-sys-0.3.8/build.rs
+@@ -75,7 +75,6 @@
+ cfg.define("USE_OPENSSL", "OFF");
+ }
+
+- let _ = fs::remove_dir_all(env::var("OUT_DIR").unwrap());
+ t!(fs::create_dir_all(env::var("OUT_DIR").unwrap()));
+
+ let dst = cfg.define("BUILD_SHARED_LIBS", "OFF")
+--- a/src/cargo/sources/path.rs
++++ b/src/cargo/sources/path.rs
+@@ -144,7 +144,7 @@
+ // the untracked files are often part of a build and may become relevant
+ // as part of a future commit.
+ let index_files = index.iter().map(|entry| {
+- use libgit2_sys::git_filemode_t::GIT_FILEMODE_COMMIT;
++ use libgit2_sys::GIT_FILEMODE_COMMIT;
+ let is_dir = entry.mode == GIT_FILEMODE_COMMIT as u32;
+ (join(&root, &entry.path), Some(is_dir))
+ });
+++ /dev/null
-Description: Relax missing_docs lint
- missing_docs lint has changed in recent rustc, and now reports some new
- entries as missing docs.
- .
- Downgrade the failure to a simple warning, to let the crate build anyway.
-Forwarded: not-needed
-Author: Luca Bruno <lucab@debian.org>
-Last-Update: 2015-11-14
-
---- a/deps/aho-corasick-0.2.1/src/lib.rs
-+++ b/deps/aho-corasick-0.2.1/src/lib.rs
-@@ -118,7 +118,7 @@
- ```
- */
-
--#![deny(missing_docs)]
-+#![warn(missing_docs)]
-
- extern crate memchr;
- #[cfg(test)] extern crate quickcheck;
---- a/deps/docopt-0.6.67/src/lib.rs
-+++ b/deps/docopt-0.6.67/src/lib.rs
-@@ -213,7 +213,7 @@
- #![crate_name = "docopt"]
- #![doc(html_root_url = "http://burntsushi.net/rustdoc/docopt")]
-
--#![deny(missing_docs)]
-+#![warn(missing_docs)]
-
- extern crate regex;
- extern crate rustc_serialize;
---- a/deps/flate2-0.2.7/src/lib.rs
-+++ b/deps/flate2-0.2.7/src/lib.rs
-@@ -25,7 +25,7 @@
- //! already existing stream to chain construction.
-
- #![doc(html_root_url = "http://alexcrichton.com/flate2-rs")]
--#![deny(missing_docs)]
-+#![warn(missing_docs)]
- #![allow(trivial_numeric_casts)]
- #![cfg_attr(test, deny(warnings))]
-
---- a/deps/git2-0.2.12/src/lib.rs
-+++ b/deps/git2-0.2.12/src/lib.rs
-@@ -65,7 +65,7 @@
-
- #![doc(html_root_url = "http://alexcrichton.com/git2-rs")]
- #![allow(trivial_numeric_casts, trivial_casts)]
--#![deny(missing_docs)]
-+#![warn(missing_docs)]
- #![cfg_attr(test, deny(warnings))]
- #![cfg_attr(all(feature = "unstable", test, unix), feature(fs, fs_ext))]
- #![cfg_attr(feature = "unstable", feature(catch_panic))]
---- a/deps/memchr-0.1.3/src/lib.rs
-+++ b/deps/memchr-0.1.3/src/lib.rs
-@@ -3,7 +3,7 @@
- to the corresponding function in `libc`.
- */
-
--#![deny(missing_docs)]
-+#![warn(missing_docs)]
-
- extern crate libc;
-
---- a/deps/num_cpus-0.2.6/src/lib.rs
-+++ b/deps/num_cpus-0.2.6/src/lib.rs
-@@ -1,6 +1,6 @@
- //! Replaces the deprecated functionality of std::os::num_cpus.
- #![cfg_attr(test, deny(warnings))]
--#![deny(missing_docs)]
-+#![warn(missing_docs)]
-
- extern crate libc;
-
---- a/deps/regex-0.1.38/src/lib.rs
-+++ b/deps/regex-0.1.38/src/lib.rs
-@@ -389,7 +389,7 @@
- //! some other regular expression engines. (We pay for this by disallowing
- //! features like arbitrary look-ahead and back-references.)
-
--#![deny(missing_docs)]
-+#![warn(missing_docs)]
- #![cfg_attr(test, deny(warnings))]
- #![cfg_attr(feature = "pattern", feature(pattern))]
- #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
---- a/deps/regex-syntax-0.1.2/src/lib.rs
-+++ b/deps/regex-syntax-0.1.2/src/lib.rs
-@@ -60,7 +60,7 @@
- ```
- */
-
--#![deny(missing_docs)]
-+#![warn(missing_docs)]
-
- #[cfg(test)] extern crate quickcheck;
- #[cfg(test)] extern crate rand;
---- a/deps/semver-0.1.19/src/lib.rs
-+++ b/deps/semver-0.1.19/src/lib.rs
-@@ -121,7 +121,7 @@
-
- #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
- html_favicon_url = "http://www.rust-lang.org/favicon.ico")]
--#![deny(missing_docs)]
-+#![warn(missing_docs)]
- #![cfg_attr(test, deny(warnings))]
-
- // We take the common approach of keeping our own module system private, and
---- a/deps/tar-0.2.14/src/lib.rs
-+++ b/deps/tar-0.2.14/src/lib.rs
-@@ -8,7 +8,7 @@
- //! [1]: http://en.wikipedia.org/wiki/Tar_%28computing%29
-
- #![doc(html_root_url = "http://alexcrichton.com/tar-rs")]
--#![deny(missing_docs)]
-+#![warn(missing_docs)]
- #![cfg_attr(test, deny(warnings))]
-
- extern crate libc;
---- a/deps/term-0.2.9/src/lib.rs
-+++ b/deps/term-0.2.9/src/lib.rs
-@@ -60,7 +60,7 @@
- html_favicon_url = "http://www.rust-lang.org/favicon.ico",
- html_root_url = "http://doc.rust-lang.org/nightly/",
- html_playground_url = "http://play.rust-lang.org/")]
--#![deny(missing_docs)]
-+#![warn(missing_docs)]
- #![cfg_attr(test, deny(warnings))]
- #![cfg_attr(rust_build, feature(staged_api))]
- #![cfg_attr(rust_build, staged_api)]
---- a/deps/toml-0.1.21/src/lib.rs
-+++ b/deps/toml-0.1.21/src/lib.rs
-@@ -36,7 +36,7 @@
- //! [2]: https://github.com/BurntSushi/toml-test
-
- #![doc(html_root_url = "http://alexcrichton.com/toml-rs")]
--#![deny(missing_docs)]
-+#![warn(missing_docs)]
- #![cfg_attr(test, deny(warnings))]
-
- #[cfg(feature = "rustc-serialize")] extern crate rustc_serialize;
+++ /dev/null
-Fromm: Luca Bruno <lucab@debian.org>
-Description: Remove stage1 extra dependencies
- Fetching extra dev-dependencies is not yet supported by bootstrap.py
- and they are not need to build. However, cargo will try to download
- them before building stage1.
-Forwarded: not-needed
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -36,11 +36,11 @@
- url = "0.2"
- winapi = "0.1"
-
--[dev-dependencies]
--tempdir = "0.3"
--hamcrest = { git = "https://github.com/carllerche/hamcrest-rust.git" }
--bufstream = "0.1"
--filetime = "0.1"
-+#[dev-dependencies]
-+#tempdir = "0.3"
-+#hamcrest = { git = "https://github.com/carllerche/hamcrest-rust.git" }
-+#bufstream = "0.1"
-+#filetime = "0.1"
-
- [[bin]]
- name = "cargo"
+++ /dev/null
-From: Luca Bruno <lucab@debian.org>
-Description: Fix relative paths in build dependencies
-Bug: https://github.com/rust-lang/cargo/issues/1863
-Forwarded: not-needed
---- a/deps/advapi32-sys-0.1.1/Cargo.toml
-+++ b/deps/advapi32-sys-0.1.1/Cargo.toml
-@@ -15,6 +15,6 @@
- name = "advapi32"
-
- [dependencies]
--winapi = { version = "*", path = "../.." }
-+winapi = { version = "*" }
- [build-dependencies]
--winapi-build = { version = "*", path = "../../build" }
-+winapi-build = { version = "*" }
---- a/deps/curl-0.2.10/Cargo.toml
-+++ b/deps/curl-0.2.10/Cargo.toml
-@@ -11,7 +11,7 @@
- url = "0.2.0"
- log = "0.3.0"
- libc = "0.1"
--curl-sys = { path = "curl-sys", version = "0.1.0" }
-+curl-sys = { version = "0.1.0" }
-
- [dev-dependencies]
- env_logger = "0.3.0"
---- a/deps/encoding-0.2.32/Cargo.toml
-+++ b/deps/encoding-0.2.32/Cargo.toml
-@@ -24,23 +24,18 @@
-
- [dependencies.encoding-index-singlebyte]
- version = "~1.20141219.5"
--path = "src/index/singlebyte"
-
- [dependencies.encoding-index-korean]
- version = "~1.20141219.5"
--path = "src/index/korean"
-
- [dependencies.encoding-index-japanese]
- version = "~1.20141219.5"
--path = "src/index/japanese"
-
- [dependencies.encoding-index-simpchinese]
- version = "~1.20141219.5"
--path = "src/index/simpchinese"
-
- [dependencies.encoding-index-tradchinese]
- version = "~1.20141219.5"
--path = "src/index/tradchinese"
-
- [dev-dependencies]
- getopts = "*" # for examples
---- a/deps/encoding-index-japanese-1.20141219.5/Cargo.toml
-+++ b/deps/encoding-index-japanese-1.20141219.5/Cargo.toml
-@@ -15,4 +15,3 @@
- [dependencies.encoding_index_tests]
- # TODO consider using dev-dependencies instead (Cargo issue #860)
- version = "0.1.4"
--path = "../tests"
---- a/deps/encoding-index-korean-1.20141219.5/Cargo.toml
-+++ b/deps/encoding-index-korean-1.20141219.5/Cargo.toml
-@@ -15,4 +15,3 @@
- [dependencies.encoding_index_tests]
- # TODO consider using dev-dependencies instead (Cargo issue #860)
- version = "0.1.4"
--path = "../tests"
---- a/deps/encoding-index-simpchinese-1.20141219.5/Cargo.toml
-+++ b/deps/encoding-index-simpchinese-1.20141219.5/Cargo.toml
-@@ -15,4 +15,3 @@
- [dependencies.encoding_index_tests]
- # TODO consider using dev-dependencies instead (Cargo issue #860)
- version = "0.1.4"
--path = "../tests"
---- a/deps/encoding-index-singlebyte-1.20141219.5/Cargo.toml
-+++ b/deps/encoding-index-singlebyte-1.20141219.5/Cargo.toml
-@@ -15,4 +15,3 @@
- [dependencies.encoding_index_tests]
- # TODO consider using dev-dependencies instead (Cargo issue #860)
- version = "0.1.4"
--path = "../tests"
---- a/deps/encoding-index-tradchinese-1.20141219.5/Cargo.toml
-+++ b/deps/encoding-index-tradchinese-1.20141219.5/Cargo.toml
-@@ -15,4 +15,3 @@
- [dependencies.encoding_index_tests]
- # TODO consider using dev-dependencies instead (Cargo issue #860)
- version = "0.1.4"
--path = "../tests"
---- a/deps/env_logger-0.3.1/Cargo.toml
-+++ b/deps/env_logger-0.3.1/Cargo.toml
-@@ -13,7 +13,6 @@
-
- [dependencies.log]
- version = "0.3"
--path = ".."
-
- [dependencies]
- regex = "0.1"
---- a/deps/flate2-0.2.7/Cargo.toml
-+++ b/deps/flate2-0.2.7/Cargo.toml
-@@ -17,7 +17,7 @@
-
- [dependencies]
- libc = "0.1"
--miniz-sys = { path = "miniz-sys", version = "0.1" }
-+miniz-sys = { version = "0.1" }
-
- [dev-dependencies]
- rand = "0.3"
---- a/deps/git2-0.2.12/Cargo.toml
-+++ b/deps/git2-0.2.12/Cargo.toml
-@@ -19,7 +19,7 @@
- url = "0.2"
- bitflags = "0.1"
- libc = "0.1"
--libgit2-sys = { path = "libgit2-sys", version = "0.2.3" }
-+libgit2-sys = { version = "0.2.3" }
-
- [dev-dependencies]
- docopt = "0.6"
---- a/deps/git2-curl-0.2.4/Cargo.toml
-+++ b/deps/git2-curl-0.2.4/Cargo.toml
-@@ -19,7 +19,6 @@
- log = "0.3"
-
- [dependencies.git2]
--path = ".."
- version = "0.2"
-
- [dev-dependencies]
---- a/deps/kernel32-sys-0.1.2/Cargo.toml
-+++ b/deps/kernel32-sys-0.1.2/Cargo.toml
-@@ -15,6 +15,6 @@
- name = "kernel32"
-
- [dependencies]
--winapi = { version = "*", path = "../.." }
-+winapi = { version = "*" }
- [build-dependencies]
--winapi-build = { version = "*", path = "../../build" }
-+winapi-build = { version = "*" }
---- a/deps/regex-0.1.38/Cargo.toml
-+++ b/deps/regex-0.1.38/Cargo.toml
-@@ -32,7 +32,7 @@
- [dependencies]
- aho-corasick = "0.2"
- memchr = "0.1"
--regex-syntax = { path = "regex-syntax", version = "0.1" }
-+regex-syntax = { version = "0.1" }
-
- [dev-dependencies]
- rand = "0.3"
---- a/deps/winapi-0.1.23/Cargo.toml
-+++ b/deps/winapi-0.1.23/Cargo.toml
-@@ -13,21 +13,21 @@
- libc = "*"
-
- [dev-dependencies]
--advapi32-sys = { version = "*", path = "lib/advapi32-sys" }
--crypt32-sys = { version = "*", path = "lib/crypt32-sys" }
--d3d9-sys = { version = "*", path = "lib/d3d9-sys" }
--dbghelp-sys = { version = "*", path = "lib/dbghelp-sys" }
--dwmapi-sys = { version = "*", path = "lib/dwmapi-sys" }
--gdi32-sys = { version = "*", path = "lib/gdi32-sys" }
--kernel32-sys = { version = "*", path = "lib/kernel32-sys" }
--ktmw32-sys = { version = "*", path = "lib/ktmw32-sys" }
--mpr-sys = { version = "*", path = "lib/mpr-sys" }
--ole32-sys = { version = "*", path = "lib/ole32-sys" }
--opengl32-sys = { version = "*", path = "lib/opengl32-sys" }
--psapi-sys = { version = "*", path = "lib/psapi-sys" }
--secur32-sys = { version = "*", path = "lib/secur32-sys" }
--shell32-sys = { version = "*", path = "lib/shell32-sys" }
--user32-sys = { version = "*", path = "lib/user32-sys" }
--uuid-sys = { version = "*", path = "lib/uuid-sys" }
--winhttp-sys = { version = "*", path = "lib/winhttp-sys" }
--winmm-sys = { version = "*", path = "lib/winmm-sys" }
-+advapi32-sys = { version = "*" }
-+crypt32-sys = { version = "*" }
-+d3d9-sys = { version = "*" }
-+dbghelp-sys = { version = "*" }
-+dwmapi-sys = { version = "*" }
-+gdi32-sys = { version = "*" }
-+kernel32-sys = { version = "*" }
-+ktmw32-sys = { version = "*" }
-+mpr-sys = { version = "*" }
-+ole32-sys = { version = "*" }
-+opengl32-sys = { version = "*" }
-+psapi-sys = { version = "*" }
-+secur32-sys = { version = "*" }
-+shell32-sys = { version = "*" }
-+user32-sys = { version = "*" }
-+uuid-sys = { version = "*" }
-+winhttp-sys = { version = "*" }
-+winmm-sys = { version = "*" }
-relax-doc-lint.patch
-add-paths-override.patch
-remove-deps-path.patch
-remove-cargo-devdeps.patch
+clean-cargo-deps.patch
+libgit2-fixes.patch
projects / cargo.git / commitdiff